Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 16 Jul 2010 12:36:52 +0000 (12:36 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 16 Jul 2010 12:36:52 +0000 (12:36 +0000)

Trivial merge